From 07276b5ebe96b4fb226a6f694c1d5b468a27faa0 Mon Sep 17 00:00:00 2001 From: Anton Gladky Date: Mon, 16 Mar 2026 06:12:27 +0100 Subject: [PATCH] Relax upstream boost version in substvars. (Closes: #1130578) --- debian/control | 2 +- debian/rules | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index fc559d93d..139be33a8 100644 --- a/debian/control +++ b/debian/control @@ -85,7 +85,7 @@ Depends: ${misc:Depends}, ${shlibs:Depends}, default-jdk [!hppa !hurd-any], default-libmysqlclient-dev, - libboost-dev (= ${boost:Version}), + ${boost:Depends}, libavcodec-dev, libavformat-dev, libavutil-dev, diff --git a/debian/rules b/debian/rules index e3e1ba08e..f1183d38b 100755 --- a/debian/rules +++ b/debian/rules @@ -169,10 +169,13 @@ execute_after_dh_installdocs-indep: find $(CURDIR)/debian/vtk9-doc/ -type f -print0 | xargs -0 sed -i 's/https:\/\/raw\.githubusercontent\.com//g' find $(CURDIR)/debian/vtk9-doc/ -type f -print0 | xargs -0 sed -i 's/https:\/\/cdn\.jsdelivr\.net\/npm\/mathjax@2/\/usr\/share\/javascript\/mathjax/g' -# Record the exact Boost version used at build time so that libvtk9-dev -# pulls in the same version and triggers a rebuild when Boost is upgraded. +# Track the versioned libboost*-dev at upstream version only, to avoid rebuilds +# on boost-defaults/binNMU uploads. execute_before_dh_gencontrol: - echo "boost:Version=$$(dpkg-query -W -f='$${Version}' libboost-dev)" >> debian/libvtk9-dev.substvars + boost_pkg=$$(dpkg-query -W -f='$${Package}\n' 'libboost*-dev' 2>/dev/null \ + | sed -nE '/^libboost[0-9]+\.[0-9]+-dev$$/p' | sort -V | tail -n1) && \ + boost_ver=$$(dpkg-query -W -f='$${Version}' "$$boost_pkg" | sed 's/-[^-]*$$//') && \ + echo "boost:Depends=$$boost_pkg (>= $$boost_ver)" >> debian/libvtk9-dev.substvars ifeq ($(DEB_HOST_ARCH),sh4) override_dh_dwz: -- 2.30.2